MSVC Builds: Fix Introspection Build

The deprecated and a11y sources of GTK+ were spun off some time ago into
their own Makefile.inc, which is then included by gtk/Makefile.am.  Fix the
generation of file sources for the GTK+ .gir.

diff --git a/build/gen-file-list-gtk.py b/build/gen-file-list-gtk.py
index 3389e0505038a6bc09f18bb312dd124982ca0e9b..d6a8cbce9935f068cfb04e58d662a795df485d7c 100644 (file)
--- a/build/gen-file-list-gtk.py
+++ b/build/gen-file-list-gtk.py
@@ -54,13 +54,26 @@ def gen_gtk_filelist(srcroot, subdir, dest):
                                         'gtk_base_c_sources',
                                         'gtk_clipboard_dnd_c_sources'])
 
+    vars_depr = read_vars_from_AM(os.path.join(srcroot, 'gtk', 'deprecated', 'Makefile.inc'),
+                                  vars = {},
+                                  conds = {},
+                                  filters = ['deprecated_h_sources',
+                                             'deprecated_c_sources'])
+
+    vars_a11y = read_vars_from_AM(os.path.join(srcroot, 'gtk', 'a11y', 'Makefile.inc'),
+                                  vars = {},
+                                  conds = {},
+                                  filters = ['a11y_h_sources',
+                                             'a11y_c_sources'])
+
     vars['gtk_other_src'] = 'gtkprintoperation-win32.c gtktypebuiltins.h gtktypebuiltins.c'
 
     files = vars['gtkinclude_HEADERS'].split() + \
-            vars['a11yinclude_HEADERS'].split() + \
-            vars['deprecatedinclude_HEADERS'].split() + \
+            vars_a11y['a11y_h_sources'].split() + \
+            vars_depr['deprecated_h_sources'].split() + \
             vars['gtk_base_c_sources'].split() + \
-                       vars['gtk_clipboard_dnd_c_sources'].split() + \
+            vars_a11y['a11y_c_sources'].split() + \
+            vars_depr['deprecated_c_sources'].split() + \
             vars['gtk_other_src'].split()
 
     sources = [i for i in files \